Unit Test Improvements
TE-489
Merge pull request #5655 from edx/ammar/unit-improvements

Unit Test Improvements