Add improved service tests. #116
Merge branch 'develop' of github.com:rinfo/rdl into develop