JR1024 simplified unit test
JR1024 updated unit test