More changes to be able to run tempest job