Fixing some syntax errors, and editing their tests.