Finished Trips and Unit Tests

Editing trips works and unit tests are done