Fixed tests
Fixed tests