Added file-layout tests.

Ported over file structure tests.