more class tests pass