Fixed tests
Gixed generator to optionaly overwrite files