Revert LPS-48386 since it doesn't allow for fast development
LPS-49600 Fix Test
LPS-49600 Sort by usage