(almost) all tests passing