Added Number, updated String, tests