Revert "Trimmed the branch to only the test/test_rospy sub directory"

This reverts commit 428c28031580a079add346479c752bd8d1353898.
Rebase from 'upstream'
Trimmed the branch to only the test/test_rospy sub directory