Fix test & some documentation