Some more tests passing.