Refactored to remove OrderId, currentValue from MovementOrderBase and its subclasses, fixed broken test.