Fixed syntax errors, all tests pass