resolve all the test failures!