Moved xquerys to-be-exectued to xbin directory. Changed import path appropriately.  Tests pass.