Added more tests
More tests
Fixed bug with case