Testing enhancements

Converted all tests to sinon-chai 'should' syntax, and removed provision for 'expect' syntax.