integrated new version of search, updated relevant tests (and removed ones that use beam, since beam is still not supported)

there's obviously a ton of stuff here :)