Adding more tests and fixing some corner cases