Clean up in test test

* Make members non-static and recreate them for each test (to ensure
that there is never a dependency between tests, even if some objects
have internal state)
* Use string constants where appropriate instead of non-final static or
final non-static strings