fix tests even more
Merge pull request #2285 from dimagi/fix-tests

fix tests even more -- (this should work since i pretty much mimic the old behavior now)