Fix test organization.