Rename recipe file (oops) and fix up tests