Updated documentation and usages with tests