Fixed syntax error and tests