Cleaning up upstream tests

I don't think I made any meaningful changes to code, but please review :)
_ is a python way to follow pep8 instruction when variable is not used