[TA33] Fix Test Failures