Fixing tests
Fixes