Small cleanup in test frameworks