Break up transform-interpolation into files
changed mocha back
small cleanup