Add C&U metric collection tests

Could this be replaced with wait_for?