Fix testcases so that they can be run in Churn without causing contention on the reservation instance variable
Add back robust version of Custom Metrics test.