rearrange the structure of test classes to limit duplication