84874c0 Sync tests with master

Authored and Committed by martinpitt a year ago
    Sync tests with master
    
        
file removed
-44
file added
+49
file modified
+5 -1
file modified
+17 -12