Added test for multiline header.
Made matrix more robustg.