Small fixes for the test suit