Almost all tests passing