Fix feature tests
Merge branch 'master' of github.com:MarcGarreau/the_pivot