Add docstrings
Minor unit test cleanup