Fix tests as well