fix test file errors from AMD conversion, refs #15942