#119: address style feedback, remove debug
fix bug introduced in last commit
#119: make restart tests less flakey