Removed unnecessary commenting
Added extra tests