Minor style fixes and keep the test manifest in sync.

It certainly works locally (Travis failed earlier due to a timeout - it looks like it's passing now).

I tried changing other references from v1beta1 to v1beta2 in this file and that caused the test to fail. So it's possible that this manifest isn't being tested in the way we expect.