Updated tests for jjc2828