change configuration of tests to a more intuitive and consistent way