Little fix
Add tests