Revert "second try - experiment: can travis run both test suites?"
Revert "second try - experiment: can travis run both test suites?"

This reverts commit 4e65e00f5b1b02d7d6aff0b6345586e33e1521c8.

Toryt/contracts,Toryt/contracts,Toryt/contracts