Fixes for the tests