Fixed 2.7.1 test failures