Fixed more test failures