Fixed behavior for test suites and completed ok tests
Added comments
Refactored method names
Merge branch 'R4_3_1-bug-trace' into R4_3_1_all-features-merged