Better test organization.