Parse fields.
Update unit tests.
Minor comments fix.