Testing the new plumbing