Refactor and red new testcase for looking up Hans