Bugfix/failing tests

Mathias Goebelrequested to merge
bugfix/failing-tests into develop

clean up some test usage wildness and fixes #116 (closed) #117 (closed)

Merge request reports