Changes to dormant calculations on viability interface and into test save