Fix for serviceeffectiverights_test adapter, and added service adapter.