users new structure and tests