Added more tests to test more edgecases