also change the tests to ensure that we handle all lines correctly. Change-Id: I13de286bda8eee57acd53af1ab5c081d3048b500