Minor test tweaks, plus tweaks to GetPrefix.py.