@zaach  Going to see how this mocking library works: http://dexterjs.com/ seems cleaner than Sinon and gives me hope we can refactor the mocks.