More options for organization factory
Fixed user_spec test

It worked by chance
Fixed user spec test to work with new org factory