Refs #6736: Updates to standard layout and adds basic tests.

This appears to be duplicated from a few lines above.