Fix multiline test based on latest changes and add todo for needed tests