Some more tests still pass

Still a major issue with National Prefix (esp AR)