- Added additional unit tests