Updated tests
Added more checks