Generator: Uncommented some tests