Fixed testing problems
Updated documentation