Changed dictionary comprehension to explicit dict() call on generated (For Travis-CI)