Getting closer to a test setup that I like.