get shim.html tests working @sbezboro @brianr
merge