Make tests pass cross-platform, reactivate