Updated jjc2828 and pkj255 unit tests