added additional tests for moving fields within templates