Remove all query references and add sanity tests for drive