Use File#read instead of #readlines.join construct
Revert to #readlines#join, but enclose it in a function

This is necessary to preserve the handling
of \r\n and \n line endings.
rename the new function
use assert_match
Merge pull request #1493 from maul-esel/feature-improvements

Improve features / tests code