rearranging structure to facilitate adding tests