Moved stream methods to the appropriate class.
created testng unit tests for it.