LPS-49600 Fix Test
LPS-49600 Sort by usage