support ASM_JS=2 not just in test runner, and remove some unneeded uses in test suite