rebuild
port query tests to busted