fixed Number problem, tests fixed