Merge Tank into the Robot and refactor Movable specs