Fix tests
Use new slots