Merge "svc_test: fix two warnings"