Fixing doc blocks and faling test