Refactor tests 1 and 2 to remove duplication
Refactor tests 1 and 2 to remove duplication

remibergsma/cosmic,remibergsma/cosmic,MissionCriticalCloud/cosmic,MissionCriticalCloud/cosmic,MissionCriticalCloud/cosmic,remibergsma/cosmic,remibergsma/cosmic,MissionCriticalCloud/cosmic,remibergsma/cosmic,MissionCriticalCloud/cosmic