Join ZDUP tests with console tests.
Merge pull request #118 from aplanas/master

Increase timeout post ZDUP