Issue10and59

Reworked DHW models and unittest.