Fix some tests to run and remove mostly unused es6-shim