[test] Improved tests to avoid all-breaking asserts and inter-test messup

[test] Improved tests to avoid all-breaking asserts and inter-test messup #3658