CARE#37: Fixed tests errors