giuseppe/fix tests suite