Some adjustements on tests after structural changes