Fixed Junit Tests
default sorts by Relevancy (included in UI). #ToUpStream
Commented out tagholders