Refactoring
Add tests
Add tests
Changed return type to streams
Add tests
Changed return type to streams