Final nit corrections and proper use of Sinon.JS