Added more service/org based endpoints and tests