surround the vars in tests by quotes for correctness
simplified the output of restarting