Tests

Merged Maximilian Schanner requested to merge tests into master

Get the new tests over to master

Merge request reports