refactoring of tests and conf