Improve features / tests code

Improves the cucumber step definitions by reducing code duplication and using `assert_match` for better error messages.