Collection tests refactorings and improvements
Stream improvements and tests