model - Fix log messages.
misc change.
Added tests for retirement changes.

Added tests for services and VMs for new retirement methods.