Fixing broken tests on progress