adding some logging
improve logging
update tests to use LookupHelper