Merge Michis Test

Arto Järvinenrequested to merge
test into main

Minimal changes to working RIZ code

Merge request reports