Modified test files. This refs #6577