Switch unit tests over to using Sinon