Primitive data types check added
Fixed bug
Added test cases