D-12341 simplifying test classes