- Added more unit tests