Issue #143: Some cleanups for tests.