Fixing test setup organization.