fix tests and quotes