Improve demo test running