update naming in MoveCalculatorTest