Unit Tests Refactoring. Some changes in DEBUG macros.

Signed-off-by: Paolo Maresca <plo.maresca@gmail.com>