[Maurizio] Fixed tests