Don't generate whitespace lines, fix tests