CFY-1232 cleanup
CFY-1232 add test for task filtering