Merge "[SPEC-272] Add service test"