Update testing

Oliver Falkrequested to merge
devel into master

No new features, just update test suite.

Merge request reports