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

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