Add tests and change description