+changes and more test for Renato