Fixing tests
Fixes to test