Fix broken test organization.