pytest: cleanup
pytest: better test hierarchy and #22 Allow non ".py" test file extension in py.test