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

This reverts commit 3096250c0a4898f604c9d5485044665b101cb1bf.
Rebase from 'upstream'
Trimmed the branch to only the self_test sub directory