[XLS-678] Fix unit test errors from previous commit