Rename LookupError and fix the corresponding test
Rename LookupError and fix the corresponding test
Fix remaining tests
Update some copyright headers