rearranging, fixing js test suite