Merge pull request #304 from bastih/master

Prevent randomly failing tests by proper dependency management