Avoid stubbing the subject under test
Fix random test failures