Tweak test organization.