Drop py2 support from more tests

Matt Harbisonrequested to merge
topic/default/py2-test-cleanup into branch/default

Merge request reports