CDITCK-405 - expanding original tests with all lifecycle events
CDITCK-405 Minor changes