Move pipeless text completely into the lexer
Fix test cases

The whitespace was incorrect before