more refactoring. Integrationtest class for the client defined.