Added tests
Added docblocks