Fix tests for previous change
Be more pythonic again