Add in metrics, work on system test for isolation

System test is still broken. Metrics need some more thought. Got some
copypasta in the isolation class.