Adding TestKit plumbing