rebase and tests

Fodor Patrik requested to merge Patrik into master

Merge request reports