36 tests still failing