Merge branch 'js/add-i-a-bit-more-tests'