Add tests for in bucket searching (merging is broken)