Test framework refactorng + sinon

@gaye R? Sinon integration is _sooo_ much easier with sandboxes