Move this into a separate file. This is dictated by the way manifest files work and enabling/disabling of tests