#677: Use retry filters in UT