Make tests compilable again after namespace changes.