Simplify success message matching regexp and fix parser spec