Break up lookup test into multiple tests, and fix broken test abt error