Update 'LinearTesting' to use new types, clean up 'Linear'.