Fix orga tests