Adding in trip object
More unit testing