Merge "Updated tests for simpler ScriptC constructors." into jb-mr1-dev