Fix tests with new structure