Because of these namespace changes tests are failing now.