Add methods to simply view a query before it's sent to the data connector
Update the unittests and data connectors