Merge test classes into one

(cherry picked from commit 225dc3ee)

Closes #3612172

Merge request reports

Loading