Addressed reviewer comments, improved unit test coverage.