Merge branch 'develop' into tests_refactor
Test framework working well
Merge branch 'develop' into tests_refactor
Fixed tempalte for testing.ini
Merge branch 'tests_refactor' into develop