JR1016 updated unit tests