Add C&U metric collection tests

I wish wait_for handled this case :)  If anyone wants to add that support I'd be happy to use it.