Fixing tests
Fixed