Test coverage for ServicesHandler

Part of bug #1152434
Change-Id: I53c2b325c638c0a3f8756ebc20d0baeb86acd6e1
Merge "Test coverage for ServicesHandler"