Fix UTs