Merge pull request #5053 from jdfreder/js-test-refact

Move&rename JS tests