Added new tests
Added more tests