WIP - Added Sinon