Re #9221. Corrected unit tests