Some small tweaks to simplify the lookup() function
Update to latest test data
Copy latest tests from pure Perl repo