Added extra test files and lines and subfolder.