Redoing tests
Merge branch 'next' of github.com:dwagon/Hostinfo into next
Handle case of no criteria is list and compare
Fixed indent issues from code conversion