More test failures fixed