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

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