move tests correctly