fix tests and services