Updated PrintUtility and QueryData in response to Sonic suggestions.
Also Updating some junit tests.