Fixing GOOD=1 tests