Bug fixes for tempest tests