Add some capability with 2.6

Some testing methods I use do not exist as well as different syntax. I had to
remove dict and set comprehensions and replace with with list ones.