new structure, added test template