Rename duplicate test methods
Remove double spacing in generated tests
Minor code cleanups