Some clean up in converting from mocha/chai to QUnit/pavlov