better configuration of test suite