Measure Metadata: Data service activity unit tests & tweaks