Adjust tests
Merge branch 'MH-1008' into dev
Merge branch 'dev' of github.com:CruGlobal/missionhub into dev