Merge "Fix internal tempest tests"