- Added and improved several unit tests