Fix tests suite