Tests cleanup

Created by  pmeunier  on February 1, 2021
NQBEOCFO4GJZKCE3A6V5LYSCEBQN2JLXPESBRJ65TZCU5JNAHEAQC
Change contents