More robust local peer testing.
Cleanup.