Changing pytests fixtures to yield-fixtures

Look here: http://pytest.org/latest/yieldfixture.html
The syntax is more clear now, I hope Py2.7 tests pass (let's see...)