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

not against removing it, but IMHO it's odd to do this in a standard layout and basic tests commit.