Re-add disabled tests