Fixed tests after landing bug 1077148