Fixed tests fails