Adapted tests to new tg structure. Some fixes of used types.

Aaron Grabowyrequested to merge
agrabowy into develop

Merge request reports