Add some more tests for edge cases