Close to all tests passing