Some code modifications so test run now

Merged Gabriel Davini requested to merge isolatest into 12.0-init_tests

Merge request reports