JOJ-57: Test fixes and small changes