Move clientThreads back to list. Add test for replace thread.