Refactor test organization.