Minor style fixes and keep the test manifest in sync.

Hrm... shouldn't this fail because v1beta2 is not a defined type?