Adding more component tests
Merge branch 'master' of github.com:chkelly/secure-data-service