More tests for corner cases