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

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