Get tests working again after rename