Refs #6736: Updates to standard layout and basic test.