Minor self-test tweaks.