Redmine #2778: oops, rename the sub tests back

Oops, putting the two `*.sub` files back.  Sorry.