Fix ordering of service-matching args in tests
Add a collector for running custom commands