Fix '\r'. Update tests.