JR1053 refactored and updated unit test
JR1053 refactored and updated unit test