critical bug with taskQueue poll and null fixed + some tests