Merge "Migrate old wiki considerations on tests"