[BUG #8618] Minor cleanup and added the sinon sandbox