Fix broken tests from moving around the stuff in shared customers.