move tests together