TDD for streams and users
fixing the merge