separated tests from source code; minor bug fixes and enhancements

Sabine Schröderrequested to merge
testing into master

update master branch

Merge request reports