Fix eruby template and don't concatenate nil on a string

Fix spec test and generator