added more junit tests regarding the CIS getQuery method + added one
more data sanity check on CIS
Merge branch 'thomasDevJuly13' into development