26 of 28 tests now passing