Fix description and improve documentation
Simplify tests