Reorganize to separate sinon tests