jesos changes
lifecycle wip
fix unit tests - wip