Initial configuration tests refactoring...