Cleanup in generated tests

Just normalizing some wording and execution.