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

sounds like a good plan.