Using less janky stream reading
Fixing some tests for now