Fixed syntax error, fixed tests