BS-9265: try to have a cleaner tests to avoid aleatory behavior (not
confident)