use both test types (django and setup)
Merge pull request #107 from dimagi/both-tests

use both test types (django and setup)