Fix tests and scenario provider