Added more tests
Added more tests