Fixes for test data in refinement mode