Complete RiddimguideSearchEngine, rearrange tests