For me it sounds like bug in tests, they should not behave the way which is impossible in real use-cases. Though I guess it might not be an easy fix so I'm OK to land this patch as it is with a 'FIXME' comment however and with a promise to look at tests issue in the nearest future.