Fixing template generation unit tests