refactoring
lifecycle - test goal fixes