code cleanup; get --zimmerman working with --test-all