** Fix tests