Fix tests
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/master' into JOJ-58
JOJ-58 Changes to output variable select following sprint review