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

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