Fixed issue with support feature and changing input types
Refactored 'number' test
add unit tests for number type