updated lookup and tests