Syntax and eol fixes
Merge test into master