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

This reverts commit 73a6b8fb602a3fa49b794a95e45697736fb1c6fa.
Rebase from 'upstream'
Trimmed the branch to only the sr_self_test sub directory