Updated Number and tests