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