Add some tests for corner cases