LPS-42295

Hey Shuyang,

This is your 500th PR, nice :)

I readded the unit test and it seems to be working.

Thx,
Laci