A few patches to fix dependency issues with Organizations.
Merge pull request #311 from open-craft/fix_test_runners

A few patches to fix dependency issues with Organizations.