Change Details

- Added unit tests. - Ran unit tests. - Fixed a couple of existing unit test issues. {F149711}