restored fixed thread pool tests on Travis CI build +  code cleanup