added tests
Merge branch 'master' of github.com:ECSE428Group/media-stream