pass most of the tests again