Started to rebuild querygen and removed unittests for now