Fix for PIR regex to also support WHOIS data where no organization is specified
Fix instructions for test.py
Improve normalization by making it leave alone (likely) abbreviations