Merge "Refactor tempest scenarios tests"