Revert "Trimmed the branch to only the sr_ronex_test sub directory"

This reverts commit 5f1a4d5c8e919c10d19c3e21cac7709d5850c84d.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sr_ronex_test sub directory