- Added extra tests