Unit test enhancements