.tests.config cleanup and further use of mocks