Added more debug information to unit to understand failures better.