improve organisation model test