More task/paired test fixes.