Fix from previous unittest refactoring and remove POOL usage