Should add some tests to be able to quickly validate new capabilities
Should add some tests to be able to quickly validate new capabilities