- Updated unit tests