Removed test workarounds that didn't have anything to do with python3