Fix state leakage and speedup in test-suite...
Fix state leakage and speedup in test-suite
This is mostly visible when running the test via pytest that
collect-then-run vs nose that runs as it collects.
While I was at it I've improved some tests to be faster by changing the
maximum recursion limit.