Add sinon and tests