add intercept.js to devDependencies, rewrite some tests