Fixed syntax error
Fixed tests