Fix failing tests with FakeSession and FakeSegment