Updates to test engine 

Cross requested with https://github.com/dimagi/commcare/pull/20