merging cucumber tests from rich-text branch