Minor style fixes and keep the test manifest in sync.

I think this means that it isn't being tested.  Can you spawn a separate issue to track that down?