improve tests and number handling