[#1208] Fix tests Pep8 and horrible and unmaintaineble dictization tests