Refactoring specs and small changes to Rover class