Issue ITTE-723

Changes on the logging strategy and added some tests.