Misc changes and fixed the imports in des_test as well as 1 problematic
unit test

Signed-off-by: Alexandre-Silva <aalexandre.grande@hotmail.com>