Fixes for the test