Cleanup sayNumber and add tests for it