Issue #3425030 by mondrake, smustgrave: Change remaining test data providers to static, simple cases (cherry picked from commit 3ed5953b)