Update and add new tests.
Update.