move fn towards dictionary comprehension
stop breaking up tuple
make test generation functional
remove redundant identifier