more lookup tests and a cleanup