Add more lookup tests