Merge "Add unit tests for all generators"