Begin cleaning up the test code to add some prune/mv cases.