Updated tests, readme and refactored for new number handling.