Finish cucumber tutorial and refactor integration test using matchers and helper functions
Merge branches 'cucumber' and 'master'