Fix tests and minor refactoring

Andrey Veltischev requested to merge update/tests_raw_data into master
  • Update procedure data and move it to dict structures.

Merge request reports