JR1062 updated unit tests