Fix doc blocks. Fix tests.