Fixed tests and docstrings