Use expects framework for assertions.
Compare lines, not long strings.
Merge branch 'master' into non-interactive

Conflicts:
	features/steps/step_definitions.py
Add missing feature (failing).