minor: test restructuring