minor changes on structure. major test change