attempt to fix #375; also update an old test