Refs #10537 Added more unit tests