Simplify services test setup
Untangle hibernation from muting