fixing some expectation bugs in run_puppet()