Merge pull request #242 from sgtcoolguy/fix

Fixes for broken nightly tests around JS CA