Add some additional plumbing and working tests