Fix in error handling
Add pytest.ini
Add a couple of helper methods
Rename variable