tests refactor + configuration change