small cleanup in tests