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

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