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

Why remove this?