Are the Task/Subsystem dependencies getting in the way? When I spiked on that change a few weeks back there was some knot that only presented itself in ~10 tests as I recall, and the knot was too hard to grok or too hairy at the time for a quick spike