Merge "feat(rng_trap): modify tests for FEAT_RNG_TRAP"