More lookup tests and a minor rename