Fix tests, update lookup usage - now using static table in benchmaker for add lookup