Added same folder structure to tests.