Fixed configuration failures. Various other changes to other tests.