Fix gutter demos (a previous change left some remnants of a previous implementation).  Reinstate tests