changed tests and syntax