merge js tests from 2.4