Add line drawing support; Fix tests