I would add this in the same bug regarding `createThreadMockup`, trying to move to `Thread` everything related with a `Thread`. Wdyt?