Upstream test fixes

PEP8 prefers two blank lines between functions.