Fixed the infrastructure tests.