Added valid tests referencing the new file-structure.