- Format code
- Update an existing test to use the contains method that would
  previously have triggered a type safety warning

Closes gh-9675