Simplify, use updated intern/sinon branch