Improved Logic test to handle changes in other classes

Better description for searched tasks. 1 task and >1 tasks