Merge pull request #345 from fsharath/fsharath

Commits to improve subscribe tests