Fix for new exception.
Fix Unit Test for altered stream IDs.
Adapt Unit Tests to stricter grammar.
Correcting method name.
Fixing imports.
Fix some dependency issues.