Fix for: BHV-8196

We are still transitioning our unit-tests from the in-house code to a more complete mocha.js based version but this is an attempt to combine the two and have them passing again in their current form.