Add more tests for integer and number