GM: Fixed failing tests