Consolidate service flushing to one command

The cmd.run ID conflict was still present with unique prefixes. I think there may be something around the use of cmd.run twice in the same state assertion.

This is currently working, committing for an official test.