change structure for testing