minimal test restructuring