fixed portion of the integration tests and added more functinality to StringQuery
Merge branch 'master' of https://github.com/dthiemann/OOSD_project_part3