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

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