Added yokozuna search + some tests