Minor style fixes and keep the test manifest in sync.
Merge pull request #785 from roberthbailey/integration

Minor style fixes and keep the test manifest in sync.