unit test improvements/enhancements