argument renaming
simplify stream initialize, slightly improve test