fix tests all the way to js-expand