Add tests for corner cases