unit test improvements/enhancements
unit test improvements/enhancements