Saved what unit tests I could
Reroute driver tests through ResolveQuery