Updated documentation
Updated tests