Improve test output
Clean up generation test output