Added new structure for tests.