restructuring to more tests