Generator : Fixed parenthesis issues and added a few tests involving scalars