combine consecutive line events

Change-Id: I3039b4b96b39507aefa9c4eb8528caf347499c42
move tests inside code package

Change-Id: I354e0c9c039f5c146e273e5e4e1e5208af6da8be
clean up local var diff handling

Change-Id: If1bd00bc614df0adcd677a75f28ac59bda96d859