Add tests
Support for lambda