Issue #3425030 by mondrake, smustgrave: Change remaining test data providers to static, simple cases
mentioned in commit 81727e87