Fixed organization test
Start using new organization factory from all test