Fixing test failures!