Fixed failing functional tests
Moved docstrings to fix doc issues