Add tests to sort only change
Refactor the way sort only app strings are built