Cleaning up Survival and Threshold

documentation and testing have been fixed for both metrics,
Threshold has been left in the "not implemented" state.
Survival is ready to be looked at.

Change-Id: I84bd04ffa00cc65ae9788f1cd6195158924fc5e7