Fixes for the test.