Slight pre-test tweaks.