remove unnecessary 2 step move when not required. add test for moving sub property up to main property