More Lifecycle/KPI Unit Tests and Some Cleanup