test : evert "hr-200 : more test improvement"

This reverts commit 5990761bfcbc517def857984499358bd257a2473.