clean up clutter in tests