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

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