Add tests and fix description