Fixing tests
Fixing tests