Moved a few more test packages to their correct file