Fix remaining tests
Merge branch 'mr' of github.com:pbs/flowy into mr