Unit Test Improvements