pep8 fixes
refactor flickr test a bit