[test] Fixing regressions and updating test suite to the new internals