Small improvements to FindTask, commented test output left in last commit