Unit test fixes
Merge remote-tracking branch 'remotes/origin/JOJ-87'
Merge remote-tracking branch 'remotes/origin/master' into JOJ-87