Add validation/test for number and binary