manipulationTestHelper: semantic + minor logic changes