Remove unnecessary grep and tr from some tests