More test refactoring + fixes
We want py.test to run in verbose mode