Added test cases, fixed issue with integer