Delete LineFactory; tweak tests