Fixed unit tests with FakeBuilderStatus