Move test formats into test subtree, adjusting maven as necessary to make that work.