Improved Mover code and tests.