Fixed failing comments tests