Fix tests by new structure