Merge Ray's recent view helper test work