restart/rebind tests: incorporate review comments