Also run the vet command against the test file.
Also run fmt and fix.
Use correct program name in diff output.
Simplify logic.