More moving and testing