Fixing merge havoc in InMemorySource
Fixing failing test