Added more tests
Added remaining tests