Adding doc blocks and a test