Issue #1808200 by sun: Fixed Unit test performance significantly decreased since system list config conversion.