Update plain text test cases and logic.
Update HTML body parsing and tests.