Add some extra edge-case tests.