Unit Test Improvements
TE-489