Fixed failing custom_organizations tests
Merge pull request #206 from martinburchell/fix_tests

Fixed failing custom_organizations tests