Updated tests
Fixed tests