file structure updated for tests