Add tests for verifying corner cases