Fixing failing tests on progress