Various tweaks for prior testing.