Minor style fixes and keep the test manifest in sync.

#791