Fix tests by changin JOIN to LEFT JOIN