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

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