Update test settings.
Minor refactoring.