Fix failing tests for missing docstrings

Also change an imported function to a private function so that it is
not exposed in __salt__.