Fixes disabled tests  (though it is arguable in its use)