Added assertions to test
Added more tests