Work on integration tests
Merge branch 'master' of github.com:pbs/flowy