Get testing working with the dummy app. Will come back to combustion later.

Also includes other fixes/updates