Renamed the lookup code and added tests
Fixed the name for a failing test