resolved almost all test failures