More unit tests, slightly easier syntax to add a doc with vals