Another attempt to improve tests coverage