Minor bug fixes and true-up of unit tests to current parsing scheme.