Fix a few unitests failurs that happen becuase we have issue with a single line parsing.