Make jenkins happy on 1.7 branch tests

* Fix some new pyflakes errors
* Fix a test that was not supposed to be run on 2014
* jenkins expects the coverage to be generated when calling "make jenkins"

Change-Id: Icdd7a3b3c31cbdf4e05e4a3133cda2c9046b2111