Added to #5895 unit test improvements list too