Add a more carefully factored test...