Linear + Testing, now rebased (part 3)

I hope this works now. I rebased on the latest master.