[#3648] Adapted unit tests