Working on docstrings and unittests