Addressed review comments. Enhanced unit tests.  Added release cleanup to unit test.