fixed tests and conf files