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

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