Updated test results related to generation of collection comprehensions.
Improved the transformations for comprehensions to be more generic