test failures fixed