Temporary force to 'number' type
Modify unit test