Added tests for subscription service
Merge remote-tracking branch 'origin/jpa' into jpa