Changed some expect calls to match to be less sensitive to control chars on Windows