API doc
Some Fixes and new Test