Cleaned up tests and docstrings