Merge "Fix Manila tempest tests"