Syntax fixes
Make a test for it