Refs #5583: add tests