#3 Refator of QueryService, ResponseService. Addition of unit tests for QueryService , ResponseService