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

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