Simple fixes for the tests