Also clean up some of the api spec for better documentation, and fix
tests.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>