Reworked test configuration.