Some more fixes for running tempest tests