* Test script cleanup backport from RKE2
Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>

* Update scripts/test
Co-authored-by: Brian Downs <brian.downs@gmail.com>
Co-authored-by: Brian Downs <brian.downs@gmail.com>