#987 Custom: Update and create new tests.