more tests

Julian Schakibrequested to merge
jschakib into develop

plenty of tests and two helper files.

Merge request reports