Added new test for psm/Surv and fixed Surv for the interval2 and cleaned up and improved labeling logic