Refactor and tidy passenger.rb and spec
Passenger add and remove methods for refctoring