Move yet another test out into its correct file