#987 Number: Update and create new tests.