Fix stream instance retrieval
Merge branch 'sinatra-testing' into js-testing

* sinatra-testing:
  Fix stream instance retrieval
Add first events working test