#987 Required: Update and create new tests.