JR1016 fix codes broken by refactoring of tests