Refs #6736: Update to standard layout and basic tests.

Ahh... right