TST - added test for streamline_mapping
BF - replace dictionary comprehention with dict() for python 2.6- support