Fix syntax issues
Fix bad test