addition to slot test, minor refactoring of search & completelogic