Added new tests and passing all tests
Added more tests and passes all current tests