Improving test environment.