N+1 fix for trips
some cucumber tests
Link to cucumber features in readme.