Nick O: Added a test around a helper contributed by Dan