BRIDGE-69 fixed
... and a bunch of stuff can be removed using the new API. Some other fixes as well to get that test working.
Merge pull request #89 from alxdarksage/develop

Update to new API; bug fixes and fix for failing test