Completing doc blocks
Fixing failing test case