Added some documentation
Added a few tests