Merge new testing code into devel

van den Bergrequested to merge
testing into devel

This fixes both #5 and #6 (closed).

Merge request reports