fixed some minor things in tests that pyflakes complained about

Change-Id: Ifeab56a964630bcf941e932fcbe39e6572e62975