reorganize tests
Merge branch 'reorg-tests'
change property name on json expected at /contact
more test fixtures and some test reorg
delete organization owners when deleting an organization
Merge branch 'master' into report-gen