Fixes to the tests