Fixes for tempest CI