Missing semicolon
Fix tests coverage
Use same logic for all syntaxes, wrap FF generators