Moved some logic from controller to service
Added more tests for tripservice, slight refactoring of tripservice