Fix MoveList so that it works outside of unit tests