Refs #6201. Fixing headers in tests.
Refs #6201. Fixing linking.