Add back new_test_set for topic clustering. (reverted from commit 06980073478ebbf4d2444679ca5bad2470002610)