ee2ab4a Fix and re-enable tests

Authored and Committed by decathorpe 2 months ago
    Fix and re-enable tests
    
        
file modified
+9 -7
file modified
+5 -3