Fix old test scripts
Fix LCAF handling of prefixes