linting.. tests need rewriting using new Stream interface