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

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