code indentation
changed 'Project' to 'Stream'
fixed modifications on files for tests
fixed modifications on files for tests