include non-db tests in catchall testrunner
minor refactor
Merge pull request #3621 from dimagi/catchall

include non-db tests in catchall testrunner