FIX: cleared ThreadPool and Tests