Cleaning up test
Large refactor of line primitive elements.

Signed-off-by: John McCutchan <john@johnmccutchan.com>