Avoiding strict schema checking in tests, until schema are updated
Updated stream wrapper handling