Fix doc
Fix spec
Add acceptance test