Revert "Revert "Merge branch 'feature/6175_script_repo' into develop""

This reverts commit 9c32b0c00e2554839111a5cafdb1d39b60c79b90.

Restore the unit tests.