Merge "Updated script group tests"