fix tests and config