almost all tests passing