Attemting to fix testing infrastructure.