Update Sinon test library
Scope tests and refactor scope object