Addressing test config and doctest issues.