Infinite streams tests
More general interface, test contract fixes
Fixed contract