I guess this won't affect the utility of the test won't change, but I'll go through and update things to use the newly-added `sinon` features.