Make testing configuration more robust