Updating calculation of numbers in tests.