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

Any particular reason you're pulling this version in?